Merge changes from original repository 

A first try.