Now working on 0.0.5.beta