first patch of changes
mergin to master