tehn Merge pull request #298 from markwheeler/lib-updates