Merge pull request #40 from datamade/master

text changes, more context info & bug fixes
added more verbose output, closes #12