issue #5 - implementation finished :-)