Fixes to scaling
Fixing getting out of bounds.
Merge pull request #37 from starteam/develop

Develop