DEV version 0.6.1