better argument string handling
Merge branch 'master' of github.com:akerl/hss