Bug fixes
Version 2.0.1
Merge branch 'phantom/style' into phantom/phpbb