140718_doc_html
Merge pull request #2 from valereA/master

140718_doc_html