fixed bugs
Merge pull request #34 from wgallop99/master

fixed bugs