Fixed conflict
Merge pull request #6 from cferdinandi/development

Fixed conflict