Merge pull request #2 from modeem/master

Merge pull request #1 from modeem/Operator