Merge branch 'dev'
Merge pull request #6 from Ragg-/master

Merge branch 'dev'