more idiomatic scala
Merge pull request #1 from tyrcho/master

more idiomatic scala