v. 0.2

Updates master to 0.2