Add option for conditional compilation
Fix typo in documentation
Merge pull request #3 from Mic92/master

Add option for conditional compilation