first commit
Merge pull request #1 from Fity/dev

first commit