Merged Skizzerz/lykos in branch 'new'
Merge pull request #2 from Vgr255/new

Merged Skizzerz/lykos in branch 'master'