Make fixes for #50 and #51 toggleable

Adds config options for them
Merge pull request #55 from ron975/development

Make fixes for #50 and #51 toggleable