Merge pull request #3 from Relicum/alttech

Merge Dev Stuff into master