bug fix nullreferenzexception
Merge branch 'master'