fixed some bugs
Merge pull request #29 from kpham13/Bugs

fixed some bugs