Small addition and bugfix for #9