Merge branch 'develop'
Update ChangeLog.md for v1.0.3
Merge branch 'develop'
Update ChangeLog for v1.0.4