Fixes #91 and added more tests