Merge pull request #20 from Fil/master