Merge pull request #22 from adrianopol/master