Some edits
v. 0.2.2