final
Merge pull request #47 from rarice4/master

final
merge errors corrected