#155 Remove config option
#155 Add functions