v0.1 - Some updates