fix code example
add defaults
reorg
port
port
Merge branch 'release/1.0.3'