Merge pull request #123 from BlueMountainCapital/mainline

Mainline Merge
First pass at sorting on data for series, #127
Continued work on #127