Merge pull request #4 from juanboesch/master