Added new mixin and fixed some bugs.
Fix (display: block)
Merge branch 'origin/master'