Bug fixes and include directory support

Here it is again. I looked at separating it but there did not seem to be a way to do that which would not have required a  merge of conflicts on your end.  Multiple branches does not work quite like breaking something into a series of patches.