mcinglis Merge pull request #5 from santazhang/patch-1 …