same as last change
Merge branch 'master' of https://github.com/Karlis/crokerwest