bit of refactoring, improving test coverage
Merge pull request #81 from catehstn/master

bit of refactoring, improving test coverage