Attempting merge into WickedCoding

Attempting to update WickedCoding/lingo with stagas/lingo