NSlog Merge to master changes

Please review and merging into master branch