Merge pull request #1 from tf0054/patch-1