Issue #9 and added tag cleanup