Nidin

merge nidin branch files to master