Added e
Added f
Updated e and f
Merge branch 'bugfix2' into dev
Added g
Updated g
Merge branch 'bugfix3' into dev