Evil commit.
Fixed the bu... erhm, defect.
Merge branch 'viktor' of github.com:khalek/ets200 into fredrik