pushing

merging working branch into master