Jbtis 165 - Updates to version and bringing in scabanovich's changes