Merge changes from pull request #186

To keep the structure simpler, I merged all the changes from https://github.com/BlueMountainCapital/Deedle/pull/186 in my branch and this is the updated pull request.