Moved input code from event thread. Fixes #2
Fixed main delay
Merge pull request #16 from freshprogrammer/dev

Dev