working emblems
Merge branch 'master' into iss175