commit bhy jyali
commit for bugfix
Merge pull request #5 from jayli/master

Auto merge by kpm server