Merge pull request #279 from danvk/datahandler-cleanup