Fixed scale bugs relating to #208
Merge pull request #209 from cdibbs/master

Fixed scale bugs relating to #208