P18 - P28
merge changes from github.com/jaceklaskowski/scalania
Merge pull request #13 from wregab/master

Thanks @wregab for the PR!