Merge pull request #5 from jprjr/master