Removing options not implemented yet to avoid confusion
Merge remote-tracking branch 'antox/master'