Beta v0.99

Need few fixes