Merge pull request #6 from jossy/master

Updated Scala version to 2.10.4
bump to 1.1.0