Updated StepButton to use new sun button implementation, see #98
Merge remote-tracking branch 'origin/master'