update for scala 2.11.1
Merge pull request #5 from sdz-dalbrecht/master

update for scala 2.11.1