Merge pull request #5 from jadiosa/master