Merge pull request #364 from aparcar/bmx7-reload