Fixed Bugs
Merge pull request #3 from pandemanish/master

Fixed Bugs