Updated with changes made in 0.1.2