Implementing feature #24, fixed malformed meta-tag
Merge branch 'feature-24' into develop