Updated Jar to include features added from the merge of both unstable branches.