new features and work in progress 0.9