Light changes
Merge branch 'Windows' of github.com:CarlRapp/Agile into Windows