Testing codeship
Merge pull request #3 from ricardojudo/development

Testing codeship