bug fix
Merge branch 'master' of https://github.com/nhmc/Barak

* 'master' of https://github.com/nhmc/Barak:
  jxp