Merging changes from lykoss/master