Merge branch 'master' of https://github.com/aengelke/hlr-1415