Issue #14: update annotation method.
I have also renamed delete as remove to match C++ API