Merge branch 'master' of https://github.com/mariofernip/conduespoch.git