Fix issue 106 and add tests for different input types
Merge pull request #107 from pauljz/dev

Fix issue 106 and add tests for different input types