Merge pull request #2 from wonderflow/master

10.15 pull