.
.
Merge pull request #1 from labe/lla/code_review

.
add changes from upstream