Merge pull request #23 from jschanck-si/master

Simplified conditional compilation for kernel use