MS: 0.9.dev

resolved #9 and #8. Beginnings for #7 and #2.