Merge pull request #26 from Itxaka/master

updated docs
Merge pull request #27 from Itxaka/develop

Merge pull request #26 from Itxaka/master