Version 0.4.2
fixed NPE