Add -output/-o option

This fixes #2