Remove debug output
Modify description according to guidelines
Merge branch 'master' into shake-and-bake