Fixed for updated KrisLibrary
Fixed conflict
Merged with guidev branch for version 0.6