Merge pull request #17 from wick-ed/master

reviewed diff and tested locally with 0.6.0
added a very basic test + additional dependencies