minor bug fixing
Merge branch 'master' of https://github.com/just-kile/Zapfmaster2000