LRA-170
Merge pull request #7 from asotog/master

LRA-170