Minor update: code commented, code cleaned.
Merge branch 'master' of github.com:floriandanielit/iapi-annotator