Rebase compiler patch on 4.02.1
Merge pull request #18 from lpw25/master

Rebase compiler patch on 4.02.1