Added tag & untag subcommands
Updated version
Fixed compile errors