Merge pull request #5 from juanboesch/master