pull together changes for 0.6

- [ ] add changes to Changelog
- release as 1.0.0 ? (#34)