resolved some differences with master