Updated API to be more readable
Merge branch 'master' of github.com:shaneagibson/primer