Merge pulled code
Export scale functions and bump version number
Create scales documentation