New version with bugfix.