TODO: implemented "2. Move this todo to bug/task tracker at Sourceforge :-)"