Fix functions scoping.
Echom message.
Merge pull request #1 from michalorman/improvements

Improvements