0.2 version with bugfix