Scala 2.11 compatibility
Merge pull request #1 from folone/master

Scala 2.11 compatibility