Merge pull request #165 from pali/lcp