removed debug printing
Merge branch 'master' into beta