Added catch-all in the main function. Resolves #15