Update unit test
Merge remote-tracking branch 'upstream/master'
Update unit test
Merge pull request #25 from jerv13/master

Update unit test