iteration 4 complete
Merge pull request #1 from Siesna/tagging

iteration 4 complete