developing
developing on
and more work
Merge pull request #1 from Eldinnie/develop

Develop->master