Merge branch 'hotfix/v1.0.1'
Fixing some bad PHP 5.5 code
Merge branch 'hotfix/v1.0.2' into develop