Changed if
Added while
Merge branch 'develop' of github.com:horak90/CodeGen into develop
While added and correction of ex 1