Added methods and gsp's type1 and type2
Added method type2
Merge remote-tracking branch 'origin/master'