Updated for release 1.3.6
Updated for release 1.3.6