Moved settings to global scope
Fixed periodic checks
Added function for editing options
Merge remote-tracking branch 'origin/anaumchev' into development