First rough patch for issues #2 and #30 for y-axis
Merge branch 'dev' of github.com:edwindj/smp into dev