Develop 2

This is what I have for now.

What do you think, not too many changes

* structural ( PS-4 ) 
* removing callable

@todo 

Modify the Readme and push directly to develop-2 .

Thoughts ?