Merge pull request #5 from danvk/master

sync sources