used a more semantically correct syntax.
more comments.
Merge branch 'hotfix/1.1.1'