Merge pull request #5 from rogerturner/master

waffle update
Merge branch 'develop' into staging
Merge branch 'staging'