1 #5

Open
pt3ulnghe wants to merge 4 commits from master into feature/hql