updates from windows
Merge branch 'master' of https://github.com/FlanFlanagan/cyclist2