Update for #23
Merge pull request #26 from MengZhang/develop

Update for #23