improved wake interval end calculation, removed key presses from wake interval
Merge branch 'development'