Merging latest from JimHokanson's repo