merging develop since a giant momory leak structure was fixed