error fixes
Merge pull request #76 from jrec15/master

error fixes