Last few touches
Merge branch 'master' of https://github.com/bighandsam/BicycleOOP