cleanup and bugfixing
Merge branch 'master' of https://github.com/ddittmar/dirk-w2-counter
cleanup and bugfixing