Merge pull request #6 from tisonkun/patch-1