Logic parser fix
Merge branch 'master' of https://github.com/HadorX/RWProj1