implemented feedback of @Stof, @stloyd and @Tobion