diff --git a/awesome-cv.cls b/awesome-cv.cls
index da3d762..0e31d8d 100644
--- a/awesome-cv.cls
+++ b/awesome-cv.cls
@@ -660,7 +660,7 @@
   \end{center}
 }
 % Define an entry of cv information
-% Usage: \cventry{<position>}{<title>}{<location>}{<date>}{<description>}
+% Usage: \cventry{<position>}{<organization>}{<location>}{<date>}{<description>}
 \newcommand*{\cventry}[5]{%
   \vspace{-2.0mm}
   \setlength\tabcolsep{0pt}
@@ -683,20 +683,15 @@
   \end{center}
 }
 % Define a subentry of cv information
-% Usage: \cvsubentry{<position>}{<title>}{<date>}{<description>}
-\newcommand*{\cvsubentry}[4]{%
+% Usage: \cvsubentry{<position>}{<date>}{<description>}
+\newcommand*{\cvsubentry}[3]{%
   \setlength\tabcolsep{0pt}
   \setlength{\extrarowheight}{0pt}
   \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{\textwidth - 4.5cm} R{4.5cm}}
-    \setlength\leftskip{0.2cm}
-    \subentrytitlestyle{#2} & \ifthenelse{\equal{#1}{}}
-      {\subentrydatestyle{#3}}{}
-    \ifthenelse{\equal{#1}{}}
+    \subentrytitlestyle{#1} & \subentrydatestyle{#2} \\
+    \ifstrempty{#3}
       {}
-      {\subentrypositionstyle{#1} & \subentrydatestyle{#3} \\}
-    \ifthenelse{\equal{#4}{}}
-      {}
-      {\multicolumn{2}{L{17.0cm}}{\subdescriptionstyle{#4}} \\}
+      {\multicolumn{2}{L{\textwidth}}{\subdescriptionstyle{#3}} \\}
   \end{tabular*}
 }
 
diff --git a/examples/cv.pdf b/examples/cv.pdf
index 205233e..927a5b7 100644
Binary files a/examples/cv.pdf and b/examples/cv.pdf differ
diff --git a/examples/cv/experience.tex b/examples/cv/experience.tex
index 48e88bc..634eb79 100644
--- a/examples/cv/experience.tex
+++ b/examples/cv/experience.tex
@@ -172,14 +172,22 @@
     {S.Korea} % Location
     {Sep. 2013, Mar. 2011 - Oct. 2011} % Date(s)
     {
-      \begin{cvitems} % Description(s) of tasks/responsibilities
-        \item {Conducted penetration testing on SAMSUNG KNOX, which is solution for enterprise mobile security.}
-        \item {Conducted penetration testing on SAMSUNG Smart TV.}
-      \end{cvitems}
-      %\begin{cvsubentries}
-      %  \cvsubentry{}{KNOX(Solution for Enterprise Mobile Security) Penetration Testing}{Sep. 2013}{}
-      %  \cvsubentry{}{Smart TV Penetration Testing}{Mar. 2011 - Oct. 2011}{}
-      %\end{cvsubentries}
+      % \begin{cvitems} % Description(s) of tasks/responsibilities
+      %  \item {Conducted penetration testing on SAMSUNG KNOX, which is solution for enterprise mobile security.}
+      %  \item {Conducted penetration testing on SAMSUNG Smart TV.}
+      % \end{cvitems}
+      \begin{cvsubentries}
+        \cvsubentry{KNOX(Solution for Enterprise Mobile Security) Penetration Testing}{Sep. 2013}
+				{
+          % These are dummy descriptions of work, since previously the subentry would not compile
+          % if you added any description to the subentry.
+					\begin{cvitems}
+						\item One Thing I did at KNOX
+						\item Another thing I did at KNOX
+					\end{cvitems}
+				}
+        \cvsubentry{Smart TV Penetration Testing}{Mar. 2011 - Oct. 2011}{}
+      \end{cvsubentries}
     }
 
 %---------------------------------------------------------