Fix NRE on keys
Set version to 2.0.5