Last setup before putting into production

master dubydul commited on 7 Jan 2019