Minor changes
Merge branch 'master' of https://Github.com/bicyclus/prototype1