Merge pull request #1 from otland/master

merge