merged in changes from master