Merge pull request #39 from ohnova/master

pull
Merge pull request #42 from ohnova/master

pull
calcul
Merge pull request #43 from ohnova/boram

calcul