Some fixes
Merge pull request #412 from ping19/master

Some fixes