Add extra options, update documentation & example