ESP and minor fixes
Merge pull request #26 from ahcorde/master

ESP and minor fixes