Merge pull request #35 from SuperJugy/test

closes #34