Merge pull request #3 from Relicum/alttech

Merge Dev Stuff into master
Merge pull request #4 from Relicum/master

Merge pull request #3 from Relicum/alttech