Small bug fixes
Merge pull request #14 from victorduan/develop

Small bug fixes