pulling latest changes
merging master
working on the look