Updated to 4.1.0e and fixed some mistakes.
Merge pull request #552 from JorWang/patch-3

Updated to 4.1.0e and fixed some mistakes.