diff --git a/todonotes.dtx b/todonotes.dtx
index 77b5b95..a73de63 100644
--- a/todonotes.dtx
+++ b/todonotes.dtx
@@ -184,7 +184,16 @@
 %             Removed some underfull box warnings, solution by Ernst Blecha.}
 % \changes{1.0.4}{2015/07/09}{Restructured documentation and placed some examples in the
 %             doc/examples subdirectory.}
-% \changes{1.0.5}{2016/11/02}{Example of how to change the space eating behaviour added by Anselm Wagner. Reduced the width of missingfigure to avoid bad box warnings.}
+% \changes{1.0.5}{2016/11/02}{Example of how to change the space eating behaviour
+%             added by Anselm Wagner.
+%             Reduced the width of missingfigure to avoid bad box warnings.}
+% \changes{1.0.6}{2018/07/09}{Changed how whitespaces are handled around inserted
+%             todos to better mimick macros like index (Suggestion by Frank Mittelbach).
+%             Fix missing character warnings using patch by Niels Anders Danielsson.
+%             Use the specified textsize for missingfigure, patch by Johannes Twittmann.
+%             Added new options for inline todonotes based on code from Daniel Krenn.
+%             Added warning message when marginparwidth is less than 2cm, as
+%             suggested by ErikBoesen.}
 % \GetFileInfo{todonotes.dtx}
 %
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -550,7 +559,7 @@
 %
 %
 % \DescribeMacro{inlinepar / noinlinepar}
-% The options |inlinepar| and |noinlinepar| (default) determine whether the inserted inline 
+% The options |inlinepar| and |noinlinepar| (default) determine whether the inserted inline
 % todonote is sorrounded with \texttt{par} macros that enforce new lines
 % prior to and after inserted inline todonotes.
 % \todo[inline, inlinewidth=5cm, noinlinepar]{Testing the option inlinepar.}
@@ -1208,12 +1217,12 @@
 \ifx\undefined\phantomsection
 \newcommand{\phantomsection}{}
 \fi
-\ifdim \marginparwidth < 2cm 
-\todo[inline]{Warning. The length $\backslash$marginparwidth is 
-less than 2cm and will most likely cause issues with the 
-appearance of inserted todonotes. 
-The issue can be solved by adding a line like 
-$\backslash$setlength\{$\backslash$marginparwidth\}\{2cm\} 
+\ifdim \marginparwidth < 2cm
+\todo[inline]{Warning. The length $\backslash$marginparwidth is
+less than 2cm and will most likely cause issues with the
+appearance of inserted todonotes.
+The issue can be solved by adding a line like
+$\backslash$setlength\{$\backslash$marginparwidth\}\{2cm\}
 prior to loading the todonotes package.} \else\fi%
 }
 %    \end{macrocode}