Improved specs and gemspec