tags added
refactoring etc
Merge pull request #41 from Mession/tags

Tags added