started with the features section
Merge branch 'issue-9' into develop