Custom installation directory improvments
Merge pull request #64 from rcleere/custom_dir_fix

Custom installation directory improvments