Merged master with dev to prep for dev changes post 1.0.9