New version 1.0.4

Signed-off-by: Niklas Ekman <niklas.ekman@gmail.com>
Merge branch 'release/1.0.4' into develop