Merge pull request #197 from henning-schild/henning/staging