Safety update of version 0.9.4