Multiple changes, following th first real use-case
Merge branch 'master' of github.com:skunkiferous/Util