Merge pull request #109 from Masterminds/feature/flatten

Feature/flatten