Merge pull request #1 from yackle/master

merge