#84 Changed if to if else if
Merge branch 'quickOptions' of https://github.com/IvenZ/htwplus into quickOptions