Trying the merge thing again.
Adding my own contribution and also merging changes.