hopefully merge issues fixed
Merge pull request #99 from LandonVance/settingsfix

hopefully merge issues fixed