Dev

merging in changes off of master