more updates
Merge pull request #8 from dengemann/v0.7

ENH: more updates