fix from merge
added some new tests
Merge pull request #17 from gentryx/master

Some more tests...