Simon: latest updates
Merge branch 'master' of github.com:eicore/eidev