Merge pull request #4 from danvk/master