Fixed bugs
Merge branch 'master' of https://github.com/Vandborg/SW505E14-Software