Refactor scale inclusion
Fix minor bugs
Merge pull request #30 from saebekassebil/scales

Refactor scale inclusion