Merge branch 'master' into dev
Added a manual
More explicit commenting
Version bump
Merge branch '1.0.3'