Merge pull request #25 from StephenHynes7/master

 add license info gemspec
Bumping up version number
 fixing merge conflict