Bugs fixed - 0.1.0 shipment
...