Check-in from Miracle
Merge branch 'master' of https://github.com/demonfox/ScratchPadCSharp