minor bug fixes
Merge pull request #2 from jaclin/master

minor bug fixes