Merge into master - Fixed Calculator, IE