First version of Builder pattern
Removing spacing, documentation pending
Merge pull request #1 from mcapodacqua/dev

Merge master and dev