LRA-173 and LRA-174 fixes
Merge pull request #7 from jkamcc/master

LRA-173 and LRA-174 fixes