Updated for version 1.1.7rc1