1.0.4

Merge 1.0.4 to master for publishing