Issue 18 - Improving documentation