Merge pull request #1 from wsl-ph/master

get all updates from master branch to staging
Merge pull request #7 from wsl-ph/staging

Merge pull request #1 from wsl-ph/master