* Added options
* Bugfix