andydbc Merge pull request #4 from loqwai/master