Merge branch 'issue/11' into 'develop'

Issue #11: Add tags

See merge request !12
2 jobs for develop in 1 minute and 2 seconds (queued for 1 second)