updated docs
fixed some todos and updated docs
Merge branch 'master' into develop
version bump