edit 1 (don't merge yet)
Merge pull request #2 from keflavich/patch-3

edit 1 (don't merge yet)