fix Magick
Merge branch 'develop'