pull dev into master

consolidating master as the main branch