Added automatic scaling for axes
Merge remote-tracking branch 'origin'