Pull Request - Straight Paths

Will implements #58.