Added calculator facility
Merge branch 'master' of https://github.com/maveric00/HomeCANtrol