Release 0.3.0

Merge back into develop to pick-up release bug fixes