Completed 0.3.4