[CODE REVIEW] Apply josdejong code review on commits 548af71 and 032383c
Merge branch 'master' of github.com:MNCC/chap-links-library