Merge pull request #90 from SuperJugy/test

Resolves #80.