Closes #18
Merge branch 'master' of github.com:Dr-Acular/TacZombie