Merged branches and changed some things for static image detection
Added quad detection