Merge pull request #2 from stewartbryson/master

Syncing master with develop