Added Emblem support
Updated documentation
Merge branch 'feature/emblem' into develop