better tagging
Merge pull request #20 from max-pi/staging

better tagging