Add function to resource the system
Merge remote-tracking branch 'mcourtois/master'