Merge pull request #2 from AxTo/master

Updated master branch.
Trying to fix alot of stuff.
Fixing stuff...
Merge pull request #3 from AxTo/testing

Merge alot of stuff to master