Merge pull request #1 from najela/revert_pull_reqest_6b08660

Revert "Merge pull request #21 from najela/master"
Merge pull request #23 from najela/master

Merge pull request #1 from najela/revert_pull_reqest_6b08660