merged changes from master, solved conflicts