Merge pull request #157 from uwescience/production

merge in dominik's changes to master