Small fixes and bump version to 0.3
Manual merge with master