Fixed bug

bug
Another fix

bug
Last fix

more bugs
Merge pull request #48 from evan012345/master

Got rid of bugs. Should work now