Merge pull request #46 from fgenolini/master

Fixed syntax errors and scale