Updated docs for version 2.0
fixes #27
fixes #28