Updated main.m, latest from dependencies