Merge pull request #1 from danvk/master