leannezhang Merge pull request #17 from mike964/patch-1