Removed debug traces
Merge branch 'issue-47'