Merge branch 'calculator' of https://github.com/BlackMinou/nit