updated to the latest version of the code
see http://bugzilla.fcdonders.nl/show_bug.cgi?id=2096 for a more complete record of all changes