Merge branch 'master' of https://github.com/vforteli/scheep.git