Merge branch 'master' of github.com:Kazade/delimit
Minor compilation fixes