sergey zhdanov's lab 3 - done.
fix warnings
fix warning
Fixed Andrey's comments
fix comments
Merge pull request #119 from zh-se/master

sergey zhdanov's lab 3 - done.