new version
Merge https://github.com/redbeardster/kolhoz