closes #10 - very simple tags

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'tags' into develop