Added changes from achilikin

Thanks!