Updated to version 1.0.4-alpha