Minor fixes for FireFox and IE
Merge remote-tracking branch 'upstream/master'
Merge pull request #225 from bstell/master

Minor fixes for FireFox and IE