Merge tag '1.0.4' into develop

More settings
Added cookie settings
Merge branch 'release/YjgxNT'