Paving the way.
Merge pull request #1 from FutilitySoft/4.0/develop

Paving the way.