Attempting to clean up master branch
more cleanup
Merge pull request #89 from scottc75/master

master branch cleanup