Fix for #933 issue

This PR fixes #933, and some minor glitches detailed in the commit messages.
I put the ```return true``` because the method is not yet implemented, you can leave this callback, I will implement it later.

Thanks