Merge pull request #1 from knaman/master