Added g
Updated g
Merge branch 'bugfix3' into dev