mguevara Merge pull request #9 from mguevara/development