Merge pull request #183 from kernigh/kernigh-include