tag partial and small route tag fix
Merge pull request #105 from lisavogtsf/lisa

Fixes my problems--only actual changes are formatting, indentation maybe

Yay!
tag partial and small route tag fixx2
Merge pull request #106 from Rakulon/master

Tag fix and partial