fixing up parse_extra_args after some testing
Bugfixes after live test
Merge branch 'master' of github.com:Klaital/toolbox