Fix for the & and * unary operators
Merge branch 'feature/addressof'