Merge pull request #42 from jrec15/master

misc changes