Beta v0.0.2

Beta v0.0.2 after comments from S.