Cleanup/add BASE_PREFIX & REF_PREFIX handling
Update version number to 1.05