Modifications after review
Merge pull request #12 from wajam/alex-scala-commons

Modifications after review