Fix NullPointerException of issue #238
Merge branch 'master' into develop