New stuffs in 4.0.2 & some fixs.
Merge pull request #42 from crafteverywhere/patch-1

New stuffs in 4.0.2 & some fixs.