LRA-171
Merge pull request #6 from asotog/master

Fixes and enhancements