Merge pull request #157 from j-j-cheng/snapshot-1.0.3

Snapshot 1.0.3