closes #31. progress on #26, #29
Merge branch 'master' of github.com:Dr-Acular/TacZombie