0.0.2 - add some more options