Merge pull request #1 from zokeber/dev

Dev