danvk Merge pull request #5 from xdrus/master