Merge branch 'Lovius-master'