Different LDA implementation
Merge branch 'develop'