Alpha 0.5

Small changes