Fixing issues ready for first functional gem release.