Fix 31&32&29(+28)
Merge pull request #36 from me4502/master

Fixed issue 31,32,28,29