fixed bugs
Merge pull request #61 from kyledaugherty/fixing_bugs

fixed bugs