removed some debug messages
Merge branch 'fix'