Merge pull request #17 from tehfreak/dev

v0.3.1, #18, close #16