[yanan] minor changes
[yanan] merge
[yanan] bugs fixed
Merge pull request #6 from gynsolomon/master

bugs fixed and release 1.0.3