Next dev iteration (0.1.7-dev)