Various fixes and improvements#16

mjrehder wants to merge 2 commits intoyannickl:swift3yannickl/SnappingStepper:swift3from

Rehsco:masterRehsco/SnappingStepper:masterCopy head branch name to clipboard