Merge pull request #4 from RReverser/master

Fixed tests
Merge pull request #6 from RReverser/master

Extension of #5 pull request (bitfields + conditionals support)