merging updates from the 3.0.3 tag