Some bug fixes
Version 2.1.2
Merge branch 'elegance/style' into elegance/black/style