P18-P20
merge changes from github.com/jaceklaskowski/scalania