Merge pull request #3 from omcnet/master