Merge of Pylint, Master and Obstacle Tab