some refactoring and a subtle change that fixes #13
minor clean up
bumped the version for the fixes and refactorings [deploy]