More testing, this time for merging.
Merge pull request #1 from ecin/testing

More testing, this time for merging.