0.0.1 - Few small bugs
Merged