Merge pull request #88 from kaznum/remove_debugging_code

Remove debugging code
Merge remote-tracking branch 'estcosmo/master'