Merge pull request #811 from corinnecurcie/stable

Adding libguide
changing source url for NDL to fix issue #807