Calculator On New Window
Merge branch 'proto_calc_make'