Merge pull request #2 from stewartbryson/master

Syncing master with develop
Merge pull request #3 from stewartbryson/develop

Merge pull request #2 from stewartbryson/master