Merge branch 'allow-additional-arguments'
Bump version