updated code to latest version, this includes bugfix http://bugzilla.fcdonders.nl/show_bug.cgi?id=2734 and http://bugzilla.fcdonders.nl/show_bug.cgi?id=2735