Support for 2.11 and 2.10
Merge pull request #1 from nicocoffo/master

Support for scala versions 2.11 and 2.10