Merge pull request #20 from leirocky/dev

Dev