nmarulo Merge pull request #28 from nmarulo/develop