Bug fixes
Version 2.0.2
Merge branch 'deluxe/style' into deluxe/phpbb