Merge pull request #6 from neinderthal/develop

Develop