Merge pull request #110 from antonblanchard/misc