Merge branch 'hotfix/1.0.1'
Merge branch 'develop'
Add missing close PHP tags
Remove trailing whitespace
Bump version number, changelog
Merge branch 'hotfix/1.0.2' into develop