fixed issue with argument inheritance
Merge remote-tracking branch 'origin/master'