Merge pull request #2 from ardumont/refactoring-with-massyl

Refactoring with Massyl
Merge pull request #3 from massyl/master

Code refactored out and enhanced design
Remove unused targets
Remove unused imports
Fix unit tests
Fix reference to the previous forks.
Fix block source rendering
Merge pull request #4 from ardumont/master

Fix reference to previous forks
exception handling and some code refactoring