Merge master branch of 'lykoss/lykos'