Include directive bugfixes
Add boolean-and instruction
New generator methods