Merge pull request #85 from SuperJugy/test

Fixes #32, Closes #83.