Final merge 1.0

hj