Version 0.3: more consistency