Merge pull request #28 from dkorolev/master

Merging as discussed with Brian offline earlier today.