minor changes for nicole
Merge branch 'master' of https://github.com/fprieur/royalvic-fak