Add options as a property

I did what we have discussed at Issue #157