Little bit of refactoring
Created gemspec and fixed parameters mapper