Merge pull request #1 from ranjan-rk/master

pull to my fork
Changes added by hemant on my machine.
Merge pull request #30 from shreyasht/master

Chnages by hemant to make it work on firefox