Fixing #127 - server engine had no modules
Close #126 - macros inside macros in artiste handled wrongly
Merge branch '0.4.0'