implemented a automatic lookat a long the path
merging with master