Further changes to API, instrumentation and annotations
Merge branch 'master' of github.com:raulcf/Seep