Merge branch 'develop'
Merge branch 'develop'
Updated to be compliant with PSR-4
Merge pull request #1 from tisogawa/master

Updated to be compliant with PSR-4