Fully removed -o. Fixes #44