Iceweasel desperation...also...Calculator
Merge pull request #502 from cldx/master

Iceweasel desperation...also...Calculator