updated for Sass support
updated with Sass support, other tweaks