updated versions for Shaheen
Merge branch 'convergence' of github.com:sanromd/emclaw into convergence