Partially fixes #50, impl in b351c09

* Updated docs
* See b351c09 for OS Keystone impl
* See dabab25 for updated tests