More testing.
Merge pull request #5 from deis/pr-five

More testing.