null pointer exception  line 245 fixed
Merge branch 'origin/master'