Feature/for master

Add latest production code to master.