Update emblem to master branch