Fixes some Sass issues
Close #73, close #79
Merge pull request #80 from MoOx/sass-fixes-73-79

Fixes Sass issues #73 & #79