Version changed, some bugfixes