Reverting changes on inline stuff
Merge branch 'master' of github.com:ArcheProject/Arche