Added tag it for nicer tagging input.
Merge branch 'clean_up' into develop