Merge pull request #2 from terrehbyte/dev

Version 1