improve arguments handing
Authored by: munterberger 2014-06-26
Parent(s): [9d46ed]
Child(ren): [578508]