Merge pull request #86 from SuperJugy/test

Resolves #81, probably resolves #58. Closes #84.