LINC: 0c20d6d Merge pull request #287 from khetzl/issue5