Merge pull request #527 from AndyHee/AndyHee-patch-20180209-1