fixed scaling
removed commented code
removed redundant boost dependencies
Merge remote-tracking branch 'origin/master'