Merge pull request #256 from antonblanchard/flash-reset