added changes to master