Merge pull request #1 from Kryten2k35/Experimental

Update from original
Merge pull request #3 from Crussader/Experimental

Data wipe fix