Merge pull request #4 from jsimonelli/master

Merging branches and changes from jsimonelli
Merge pull request #5 from jsimonelli/claudiol-interactive-evmcmd

Merge pull request #4 from jsimonelli/master