LRA-162 and LRA-163 fixes
Merge pull request #5 from jkamcc/master

LRA-162 and LRA-163 fixes