Coming soon v 0.01

Conflict resolved