Merge pull request #32 from mnederlof/workaround-options

Add configurable workaround to enable live snapshots