Forgot to include in previous optimization submittal
Merge branch 'master' of https://github.com/ddelvecchio/emf