Merge pull request #13 from AlexNaj/dev

Dev