used for review 23-10-2013

head: martinamalberti:tagme_cic_review_23102013
base: master
tagme: cic_review_23102013