Resolves #176
Merge branch 'master' of github.com:Deadrik/TFCraft