Merge pull request #1 from callemall/master

Sync with callemall
Implementing #104
Change based on suggestion from @hai-cea
Another fix as suggested by @hai-cea
Merge pull request #116 from DeviaVir/remove-roboto

Remove roboto - Fixes #104