First commit from Frank
Merge branch 'Frank' of https://github.com/TheSpearGroup/Voyager