Updated documentation
Merge pull request #25 from juanf/master

Updated documentation