merging develop branch

got a little out of sync