Merge pull request #4 from jdl031/master

Big pull from master
Miscellaneous changes
Merge pull request #7 from ClarkZinzow/master

Miscellaneous changes