Merge pull request #1 from acron0/dev

Dev