Merge branch 'release/1.0.4' into develop
Made the temporary source filename more like the cm:name in order to support word fields

Signed-off-by: Niklas Ekman <niklas.ekman@gmail.com>
Merge branch 'release/1.0.5'
Added support for XLSM & change default format to 2b