Release/v0.4

Saeed, please kindly review this pull request.
This is the result of my today meeting with Amir ;)