Minor refactoring
Merge pull request #373 from jorgesilva/develop

Minor refactoring