Close #136 and add missing sources.