Checkin for release Beta 0.2.1 (2013-6-30)