Update to 0.3 - Many fixes and additions