Version 0.2 complete