Upgrade to shavaluator 0.0.2