jgabry Merge pull request #2 from fsdias/master