a few changes
fixed insertion
//
Merge remote-tracking branch 'origin/master'