Merge pull request #11 from akuraru/master

Adding tests for #9