Pull Sansibar fork into main DoctorD1501 branch 9-26-2014