Polished code - added punctionality
Merge branch 'master' of github.com:floriandanielit/iapi-annotator