Merge pull request #247 from Yahkob/codecleanup

feature(public, gruntfile.js) Code cleanup
Merge pull request #248 from Yahkob/firefoxSupport

feature(public): more firefox compatibility
feature(public): fix firefox compatiblity