Changed the code to support changes in HJ library
Merge remote-tracking branch 'origin/master'