V4.1: Config added and bugfix