final submit
Merge pull request #80 from cnutter3/master

final submit