computation
Merge pull request #7 from voklorok/master

computation