Updated to v 0.2