Fixed a couple of bugs
Merge branch '7.x-1.x' of github.com:vih/vih_styles into 7.x-1.x