Changed annoying unconformant _'s
Merge branch 'master' of github.com:Gazok/Tank