Windrose added
Merge branch 'fulldecent-master'