Merge pull request #152 from kwyxz/master