updating master

with work from dev branch