Fixed "e"
Merge branch 'master' into dev