Merge pull request #8 from jossy/master

Updated Scala version to 2.11.1
bump to 2.1.0
Merge branch 'master' into develop