Updated to version 1.0.2-beta