Working code from 1.0.0
Merge branch 'release/1.0.0'