Fixes #14
Fixes #15
Changing poms to version 1.0.1