Issue 9 fixed with an OPTIONAL-clause.