Merge pull request #69 from wimleers/avoid-downtime