Merge pull request #1 from dbellettini/master

Ignoring composer stuff