API Primer changes
Merge remote-tracking branch 'origin/pr/14' into hotfix/14
[#14] Reviewed and edited
Merge branch 'hotfix/14'

Close #14