fixed issues
Merge pull request #52 from jbwilmoth/issues_fix

fixed issues