SteveKChiu Merge pull request #154 from automata-tech/master