Merge of Srikanth's work
rebuild jar