Merge in Minotar 1.0