Signed-off-by: Heikki Hokkanen <hoxu@users.sf.net> [hoxu@users.sf.net: removed some unrelated changes]