Merge pull request #17 from akkie/master

Final changes for version 0.3
Cross build for Scala 2.10 and 2.11