Merge pull request #13 from mmmavis/master

Merge in develop branch
Merge branch 'master' into develop