renaming
removed npe's
Merge remote-tracking branch 'origin/master'