Feature and bugfix