Merge pull request #3 from zpbx/dev

Update source code and testing code.