Allow additional parameters.
Merge branch 'master' of git@github.com:JornWildt/Ramone.git