Updated docs
Merge pull request #24 from cferdinandi/development

Updated docs