Merge pull request #137 from amirsh/topic/type-providers

Merging commits from master branch into type-providers