Update from DfE
Better formatting
Merge pull request #1 from Digital-Contraptions-Imaginarium/master

Upstream changes