Third commit
Merge pull request #1 from johndaskalakis/develop

Second commit
Merge branch 'master' into develop