readability support (fix #108)
prevent NPE
Merge remote-tracking branch 'upstream/master'