Final bugifx
Merge branch 'master' of https://github.com/Syratax/progEx.git