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