maj
minor changes
merge issue