Merge pull request #203 from malytomas/master

Help supporting local builds-without-install.