Updated to version 1.2