Update ChangeLog for v1.0.4
Merge branch 'develop'