retry of removal of debugging code
Merge pull request #124 from wseyler/dev

retry of removal of debugging code