Merge pull request #16 from Khppp/dev

Dev