Updated to stable branch