Merge pull request #1 from orignal/master