Options are replaced by additional features

fixed #17