Trying testing branch
Merge pull request #1 from Kyriosone/testing

Merging test branch into testing