Merge into master - Fixed Calculator, IE
Merge pull request #646 from shutter111/master

Merge into master - Fixed Calculator, IE