Re: [arch-projects] merging for 1.4.0

I'm thinking that I'll clone your repo and apply my changes in a cleaner/more organised way