Full rebase
Merge pull request #1 from Hackrylix/testing

Full rebase