nearly there
Merge pull request #13 from kmyr/development

nearly there
Merge pull request #14 from kmyr/staging

Staging