Merge Franco + Updated SGM-NODEJS