prepring to merge
merged with github