lnicola Merge pull request #54 from tisonkun/patch-1