Fix Issue404

Fixes #404. I tried to use optional parameters on static members but the externs turned it into a nightmare so I went with an option instead.