fix launcher command overload
Merge pull request #3 from ydubreuil/master

rebased fixes from my 'experiments' branch