Updated to oF 0.8.1