Merge Minim files from develop branch