Merge pull request #8 from nulib/development

merge development -> staging
Merge pull request #9 from nulib/development

fixed text
Merge branch 'development' into staging
Merge branch 'development' into staging
Merge branch 'development' into staging
Merge branch 'development' into staging
Merge branch 'development' into staging
Merge branch 'development' into staging
Merge branch 'development' into staging
Merge branch 'development' into staging
Merge branch 'development' into staging