fixed #14
very minor improvement though
more to come...