Bug fixes

Implemented new shape for badge (Oval)
Merge remote-tracking branch 'origin/master'