Prepare #26, #29, #30, #31
Merge branch 'master' of github.com:Dr-Acular/TacZombie