Merge pull request #2 from dsonet/patch-1