Using optional parameters
Merge branch 'master' of github.com:PeterButzelaar/Butzelaar.Generic