Phase 1
Merge pull request #1 from stefan-gencarau/master

Phase 1