Fixed Windows Output
Merge branch 'devel'