Merge pull request #1 from RAZR-K-Devs/JBX_30X

merge jbx branch