Fix for #2 #9

Open
aabluedragon wants to merge 3 commits from aabluedragon/fix-esm:master into master