Updated a bit more. (Bug #12)