kvnkuang Merge pull request #42 from kvnkuang/dev