Merge pull request #2 from adamapps/develop

develop branch
Merge pull request #3 from adamapps/develop

new merge test
Merge pull request #4 from adamapps/master

fdsa