Adding fixes for compatibility with J3.x
Merge pull request #4 from rbsl-shakuntala/patch-3

Adding fixes for compatibility with J3.x