Updated to v 0.1.1