added changes from master