Implementing feature #24, added meta tags
Merge branch 'feature-24' into develop