Merge pull request #107 from balticit/stage

Stage
Merge pull request #1 from balticit/master

m
Calculator and relations update
Otstupi
Otstupi
Merge pull request #108 from lmudvaynel/master

Update calc