Switched to short options

Fixes #48