Merge pull request #1 from rulus/master

merge
Merge pull request #13 from Orangen/master

Merge pull request #1 from rulus/master