removed smiley face :(
Merge origin/master