LRA-185
LRA-184
Merge pull request #8 from asotog/master

Enhancements