Bug fixes
Merge pull request #99 from ping19/master

Bug fixes