Merge of IvanMartinez work, PR #47
Merge branch 'IvanMartinez-api_docs'