Merge pull request #1 from princejwesley/master

Refactored & fixed quite a few issues
:bug: fix for firefox issue
Merge pull request #1 from senthilporunan/master

Merge