great commit
Merge pull request #1 from bazoon77/master

great commit 2