Merge pull request #1 from jlambert121/master

bug fixes