Update Jb-dev branch 

Thanks munjeni