Major overhaul
Fix gemspec