wayfind Merge pull request #9 from haozi/master