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