Some bug fixes
Updated gemspec