Merged Skizzerz/lykos in branch 'new'