Merge pull request #4 from marksomnian/dev

Dev
Merge branch 'master' into dev