Small bugfixes and updates for samples.
Merge branch 'master' of https://github.com/ivanpointer/CLI