Replaced background thread with NSTimer scheduled timer
Merge branch 'Mark_Branch'