many changes :-) (must comit more often)
Merge pull request #19 from UFOMelkor/hotfix/17

Options are replaced by additional features