beta 0.6
dev branch