Merge pull request #4 from pixces/develop

Develop
Merge remote-tracking branch 'origin/master' into develop