sync to R9717
Merge pull request #24 from heugabel/master

sync to R9717