Merge pull request #269 from nluedtke/staging

Staging