merge test

just testing a merge of my branch back into master. guessing osmond will have to review request and then approve / reject request.