v0.6 Minor performance improved.