Fix further issues with optional arguments
Bump version to 0.1.8