Handle places or paths but not both
Merge pull request #23 from beaugunderson/master

Handle places or paths but not both