some changes while going through the code
revert one change
another change
Merge pull request #1 from konstin/master

some changes while going through the code