- Added callbacks to cursor
- Ensured C++ wrapper code is removed during 'clean' automake target