Treat the -o argument properly

Treat the -o argument properly. Fixes #17