Fix NullPointerException
Update version
Optimize stuff