Merge pull request #12 from AndrewPickford/master

Sync Andrew:master to develop