Fix for EM definition
Merge branch 'master' of github.com:reliv/rcm