new old version
Merge branch 'master' of github.com:kosmass/heresy