Merge pull request #10 from ffd114/master