comments added, still not stable
Merge branch 'calc' of github.com:/esel7353/p-master into calc