Third commit
Merge branch 'master' into develop
Merge pull request #2 from johndaskalakis/develop

Develop