NSlog Merge to master changes