Support for keyword arguments
Merging origin/master'
Code refactoring by @djgilcrease