Updated to v1.3.6