Static Analysis: Fix nil dictionary key and value
Update docs
Merge branch 'release/0.0.7' into develop