Merge pull request #2 from Patcraft/dev

Fix #1
Merge branch 'refs/heads/dev'
meg