Merge pull request #1 from dimd13/revert

Revert
Merge pull request #2 from dimd13/master

Merge pull request #1 from dimd13/revert