minor improvements
Merge pull request #18 from lveci/beam-core-jai

Beam core jai