Finish Lecture2Lab and merge with master branch