Fix issue with short opts, closes #40
0.6.1