Made some small changes
Updated to V1.2.0