Merge pull request #116 from kapetan/upstream

Removed debug code