Merge pull request #433 from rogerpueyo/bmx6-graph