switched to dev-master
Merge pull request #1 from blackcorvidae/dev-master

switched to dev-master