New version 2.0.1
Fix NPE