v0.1.1 - Working version