Remove useless error message
Remove debug
Merge pull request #115 from zoic21/master

Merge from master