Update with recent changes
Merge pull request #4 from cvitter/master

Complete 2.0 update with scan operation