Merging with 1.0pre2

Donwloaded and extracted 1.0pre2 over old version to update and continue
from were Istvan Petres left off