FIX
Merge branch 'master' of https://github.com/AyaxS/cimagen-v3