Updated with the bugfix #1 in master
Added all options to the documentation