Updated documenation
Merge pull request #128 from cferdinandi/development

Updated documenation