Merged Skizzerz/lykos in branch 'master'