Merge pull request #2 from waspframework/4.0.x

Update master with latests major bug-fixes
Merge pull request #3 from waspframework/master

Merge pull request #2 from waspframework/4.0.x