final changes for version 1.6
update ignore
fixed conflicts
fixed conflicts