Merge pull request #5 from jsubhong/master

Bug fixes