merged in Scott Spencer's Pull request items