Update the documentation based on changes made in the code
Merge remote branch 'parentrepo/master'

Conflicts:
	ssl-api.en.rst
Merge pull request #2 from shinrich/master

Updating based on implementation