References #126, this solved the new installation case.

Changed the code to work correspondingly for new installations. Current
systems will need to be modified manually.