Modify regexp to limit type model word only
Merge branch 'master' into point_type
Fix bug that occured in Point.apply
Fix bug on Graph.getPointTypes
Merge branch 'point_type'