[close #16] Merge branch 'lemur' into master