Neccessary amend to pull #96 - still throws exceptions in some cases
[ci-skip]
Merge pull request #105 from jayunit100/master

Neccessary amend to pull #96 - still throws exceptions in some cases
[ci-skip]
Merge branch 'master' into hadoop-2.1.0