Updated to handle JB data
Merge pull request #24 from ramain/master

Updated to handle JB data