Update source code
Merge pull request #56 from alfred99/testkit/update

Update source code