closes #396

as requested splitted the pull