mswift42 Merge branch 'williamyao-master'

Latest commit c0f9c70

Sep 18, 2015