Merge pull request #18 from wolfy1339/develop

Develop
Merge pull request #23 from wolfy1339/develop

Develop
Merge pull request #24 from wolfy1339/master

Merge branches