Merge branch 'dev'

diff --cc README.md
Simple merge

diff --cc docs/api.md
Simple merge

diff --cc docs/setup.md
Simple merge

diff --cc docs/usage.md
Simple merge