Merge pull request #2 from BenjamenMeyer/master

Testing