comments on bugs
Merge branch 'master' into win8factor