Merge pull request #2 from echel0n/dev

Dev