Merge pull request #1 from rulus/master

merge