ENH: updates
next iteration
Merge pull request #7 from dengemann/v0.7

WIP: updates