options added
Merge branch 'oramx-margarita' of github.com:jantwisted/oramx into oramx-margarita