Merge branch 'master' of github.com:brunetto/sltools-dev
Merge branch 'master' of github.com:brunetto/sltools-dev