Merge pull request #21 from dtsato/master

Thanks Danilo!