Merge work to date from development branch.
Version update - 0.8.2