Fix #105 + tests
Merge pull request #106 from bzick/develop

Fix #105 + tests