Tabs to spaces. Jeeez. Added 1min timer setting.
Merge branch 'master' of github.com:lizter/EIT_ORK