Merge pull request #36 from jihchi/patch-1