first commit
Merging Henner's changes.