Merge branch 'develop' of https://github.com/jojoob/lmc into develop