merge
merge
just cleaned up a little bit
Merge branch 'master' into ad_testing