Merge pull request #4 from asotog/master

LRA-165 LRA-164 LRA-161