Merge pull request #228 from ozbenh/misc