Merge pull request #1 from alkhimey/dev

Dev